Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump kubernetes to 1.32.1 #5436

Merged
merged 2 commits into from
Jan 21, 2025
Merged

Bump kubernetes to 1.32.1 #5436

merged 2 commits into from
Jan 21, 2025

Conversation

juanluisvaladas
Copy link
Contributor

@juanluisvaladas juanluisvaladas commented Jan 14, 2025 •
edited
Loading

Description

Bump kubernetes to 1.32.1

Type of change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Documentation update

How Has This Been Tested?

  • Manual test
  • Auto test added

Checklist:

  • My code follows the style guidelines of this project
  • My commit messages are signed-off
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings
  • I have added tests that prove my fix is effective or that my feature works
  • New and existing unit tests pass locally with my changes
  • Any dependent changes have been merged and published in downstream modules
  • I have checked my code and corrected any misspellings

@github-actions GitHub Actions
Copy link
Contributor

This pull request has merge conflicts that need to be resolved.

@twz123 twz123 mentioned this pull request Jan 17, 2025
Merged
@juanluisvaladas
Copy link
Contributor Author

Unit test failure can be ignored, it's because I defined an image in pkg/constant/constant.go which breaks the test, that will be fixed once we release the kube-router 1.32.1 image.

Additional tests:

@juanluisvaladas juanluisvaladas changed the title [WIP] Bump kubernetes to 1.32.0 [WIP] Bump kubernetes to 1.32.1 Jan 17, 2025
@twz123 twz123 mentioned this pull request Jan 17, 2025
Merged
@github-actions GitHub Actions
Copy link
Contributor

This pull request has merge conflicts that need to be resolved.

@github-actions GitHub Actions
Copy link
Contributor

This pull request has merge conflicts that need to be resolved.

juanluisvaladas
juanluisvaladas commented Jan 18, 2025
View reviewed changes
pkg/constant/constant_test.go Outdated
@@ -132,25 +132,9 @@ func TestContainerdModuleVersions(t *testing.T) {

func TestRuncModuleVersions(t *testing.T) {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The runc dependency is gone, I kept this to just check that vars.sh returns a runc_version number that makes sense. I'm not too sure what to do about this, maybe we should entirely remove the test or leave it as is because it's not hurting anyway...

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, this is already the second time the dependency vanished from upstream. I'd be comfortable with removing the test entirely. I think that's what I did last time (need to check the git history).

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed the test entirely.

@juanluisvaladas juanluisvaladas changed the title [WIP] Bump kubernetes to 1.32.1 Bump kubernetes to 1.32.1 Jan 18, 2025
juanluisvaladas
juanluisvaladas commented Jan 18, 2025
View reviewed changes
Makefile
@@ -146,10 +146,15 @@ $(controller_gen_targets): $(GO_ENV_REQUISITES) hack/tools/boilerplate.go.txt ha
touch -- '$@'

# Run register-gen for each API group version.
# Usually register-gen should should be:
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please check this. I think this is a reasonably good option given the current circumstances.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Urgh, so this is what we get for not evaluating the upstream alpha and beta releases. Pretty sure we could've avoided this to land in the final Kubernetes release. WDYT concerning kubernetes/kubernetes#129290 (comment)? Should we maybe set those GODEBUG flags, as well?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if we should have this as a separate commit, just for reference, and to maybe revert it whenever the issue is fixed upstream.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I moved it to a separate commit. I'd like the actual version bump commit to pass the tests so I moved this commit before the bump.

@juanluisvaladas juanluisvaladas marked this pull request as ready for review January 18, 2025 10:14
@juanluisvaladas juanluisvaladas requested review from a team as code owners January 18, 2025 10:14
@juanluisvaladas juanluisvaladas requested review from kke and makhov January 18, 2025 10:14
@juanluisvaladas juanluisvaladas force-pushed the kubernetes-1.32.0 branch 2 times, most recently from e1e23a3 to f902897 Compare January 18, 2025 10:34
@juanluisvaladas juanluisvaladas added this to the 1.32 milestone Jan 20, 2025
twz123
twz123 reviewed Jan 20, 2025
View reviewed changes
go.mod Outdated
sigs.k8s.io/controller-runtime v0.19.4
sigs.k8s.io/yaml v1.4.0
)

require k8s.io/cluster-bootstrap v0.0.0
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably a bad merge conflict resolution?

Copy link
Contributor Author

@juanluisvaladas juanluisvaladas Jan 20, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Most certainly, it used to be in line 72. I moved it back to line 72 and set it to v0.32.1

pkg/constant/constant_test.go Outdated
@@ -132,25 +132,9 @@ func TestContainerdModuleVersions(t *testing.T) {

func TestRuncModuleVersions(t *testing.T) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, this is already the second time the dependency vanished from upstream. I'd be comfortable with removing the test entirely. I think that's what I did last time (need to check the git history).

@juanluisvaladas
Temporarily lock register-gen to 0.31.5
7eeaf07 
Due to kubernetes/kubernetes#129290 we cannot
use v0.32.1. Temporarily lock it to v0.31.5. This must be reverted once
it's fixed.

Signed-off-by: Juan-Luis de Sousa-Valadas Castaño <[email protected]>
@juanluisvaladas juanluisvaladas force-pushed the kubernetes-1.32.0 branch 2 times, most recently from 0d150e6 to 8252cc4 Compare January 20, 2025 16:02
@juanluisvaladas juanluisvaladas merged commit 7c0a307 into k0sproject:main Jan 21, 2025
94 checks passed
@juanluisvaladas juanluisvaladas deleted the kubernetes-1.32.0 branch January 21, 2025 16:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@twz123 twz123 twz123 approved these changes

@kke kke Awaiting requested review from kke kke is a code owner automatically assigned from k0sproject/k0s-maintainers

@makhov makhov Awaiting requested review from makhov makhov is a code owner automatically assigned from k0sproject/k0s-maintainers

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
1.32
Development

Successfully merging this pull request may close these issues.
2 participants
@juanluisvaladas @twz123